From a5ca197fb5fb6996749d4954f17779b69ca9a7a2 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Fri, 9 Mar 2007 18:32:20 +0000 Subject: [PATCH] xen/x86: add allocation success checks. The necessary fix to arch_domain_create() was discovered by Gerd Hoffmann, but apparently not submitted so far. Also, adjust two error codes. Signed-off-by: Jan Beulich --- xen/arch/x86/domain.c | 6 ++++-- xen/arch/x86/domctl.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 57fc717915..eee2c88197 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -457,8 +457,10 @@ int arch_domain_create(struct domain *d) fail: free_xenheap_page(d->shared_info); #ifdef __x86_64__ - free_domheap_page(virt_to_page(d->arch.mm_perdomain_l2)); - free_domheap_page(virt_to_page(d->arch.mm_perdomain_l3)); + if ( d->arch.mm_perdomain_l2 ) + free_domheap_page(virt_to_page(d->arch.mm_perdomain_l2)); + if ( d->arch.mm_perdomain_l3 ) + free_domheap_page(virt_to_page(d->arch.mm_perdomain_l3)); #endif free_xenheap_pages(d->arch.mm_perdomain_pt, pdpt_order); return rc; diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index d8ca0b0621..00bb202d57 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -145,6 +145,12 @@ long arch_do_domctl( } arr32 = alloc_xenheap_page(); + if ( !arr32 ) + { + ret = -ENOMEM; + put_domain(d); + break; + } ret = 0; for ( n = 0; n < num; ) @@ -157,7 +163,7 @@ long arch_do_domctl( domctl->u.getpageframeinfo2.array, n, k) ) { - ret = -EINVAL; + ret = -EFAULT; break; } @@ -201,7 +207,7 @@ long arch_do_domctl( if ( copy_to_guest_offset(domctl->u.getpageframeinfo2.array, n, arr32, k) ) { - ret = -EINVAL; + ret = -EFAULT; break; } -- 2.30.2